From cecd0e026fe65b761653dcc26b3c288cf38f6d7d Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Sat, 17 May 2025 13:58:35 +0000 Subject: [PATCH] qt5*: globally define Qt5 version --- frameworks/qt5/common.mk | 2 ++ frameworks/qt5/qt5base/Makefile | 4 ++-- frameworks/qt5/qt5graphicaleffects/Makefile | 4 ++-- frameworks/qt5/qt5quick2-controls2/Makefile | 4 ++-- frameworks/qt5/qt5quick2/Makefile | 4 ++-- frameworks/qt5/qt5script/Makefile | 4 ++-- frameworks/qt5/qt5tools/Makefile | 4 ++-- frameworks/qt5/qt5translations/Makefile | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/frameworks/qt5/common.mk b/frameworks/qt5/common.mk index e630d5f..239062f 100644 --- a/frameworks/qt5/common.mk +++ b/frameworks/qt5/common.mk @@ -5,6 +5,8 @@ # See /LICENSE for more information. # +QT_VERSION:=5.15.16 + # for target builds (STAGING_DIR) QT_INSTALL_PREFIX:=$(CONFIGURE_PREFIX) QT_INSTALL_CONFIGURATION:=/etc/qt5 diff --git a/frameworks/qt5/qt5base/Makefile b/frameworks/qt5/qt5base/Makefile index b0872f9..b170e80 100644 --- a/frameworks/qt5/qt5base/Makefile +++ b/frameworks/qt5/qt5base/Makefile @@ -10,9 +10,10 @@ # - no X11/wayland/xcb/kms support so far - primary target is linuxfb include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5base -PKG_VERSION:=5.15.16 +PKG_VERSION:=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=b04815058c18058b6ba837206756a2c87d1391f07a0dcb0dd314f970fd041592 @@ -40,7 +41,6 @@ HOST_BUILD_DEPENDS:=qt5base include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk # hard disable udev support for now diff --git a/frameworks/qt5/qt5graphicaleffects/Makefile b/frameworks/qt5/qt5graphicaleffects/Makefile index 3d3f8f0..c93e6b0 100644 --- a/frameworks/qt5/qt5graphicaleffects/Makefile +++ b/frameworks/qt5/qt5graphicaleffects/Makefile @@ -6,9 +6,10 @@ # include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5graphicaleffects -PKG_VERSION:=5.15.16 +PKG_VERSION=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=d185813737f38352d81b3a405a9243aca1af7bfebe37aba22a4099a7031f640a @@ -23,7 +24,6 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk define Package/qt5graphicaleffects diff --git a/frameworks/qt5/qt5quick2-controls2/Makefile b/frameworks/qt5/qt5quick2-controls2/Makefile index c30ecf4..3351a30 100644 --- a/frameworks/qt5/qt5quick2-controls2/Makefile +++ b/frameworks/qt5/qt5quick2-controls2/Makefile @@ -6,9 +6,10 @@ # include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5quick2-controls2 -PKG_VERSION:=5.15.16 +PKG_VERSION=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=6bdc134c7f86dcf0e416d89d96d0d1d1415ea465bceb1f360fb5badf2adcaa16 @@ -22,7 +23,6 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk define Package/qt5quick2-controls2 diff --git a/frameworks/qt5/qt5quick2/Makefile b/frameworks/qt5/qt5quick2/Makefile index 83bce29..914dcff 100644 --- a/frameworks/qt5/qt5quick2/Makefile +++ b/frameworks/qt5/qt5quick2/Makefile @@ -6,9 +6,10 @@ # include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5quick2 -PKG_VERSION:=5.15.16 +PKG_VERSION=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=4e05de0747176a8a86a8c098ad215c2cdf1825a572b62a70b2e91cd81357408d @@ -23,7 +24,6 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk define Package/qt5quick2/Default diff --git a/frameworks/qt5/qt5script/Makefile b/frameworks/qt5/qt5script/Makefile index 9a658d6..7d7bfd2 100644 --- a/frameworks/qt5/qt5script/Makefile +++ b/frameworks/qt5/qt5script/Makefile @@ -6,9 +6,10 @@ # include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5script -PKG_VERSION:=5.15.16 +PKG_VERSION=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=0b98baa6eece7d0e7860590dd67faf452499096f62f33d16556fd38ac236eec2 @@ -23,7 +24,6 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk define Package/qt5script/Default diff --git a/frameworks/qt5/qt5tools/Makefile b/frameworks/qt5/qt5tools/Makefile index 9fac6e1..f65129f 100644 --- a/frameworks/qt5/qt5tools/Makefile +++ b/frameworks/qt5/qt5tools/Makefile @@ -6,9 +6,10 @@ # include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5tools -PKG_VERSION:=5.15.16 +PKG_VERSION=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=1cab11887faca54af59f4995ee435c9ad98d194e9e6889c846692c8b6815fc1c @@ -27,7 +28,6 @@ HOST_BUILD_DEPENDS:=qt5base/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk define Package/qt5tools diff --git a/frameworks/qt5/qt5translations/Makefile b/frameworks/qt5/qt5translations/Makefile index e0fda9e..e9f11e4 100644 --- a/frameworks/qt5/qt5translations/Makefile +++ b/frameworks/qt5/qt5translations/Makefile @@ -6,9 +6,10 @@ # include $(TOPDIR)/rules.mk +include ../common.mk PKG_NAME:=qt5translations -PKG_VERSION:=5.15.16 +PKG_VERSION=$(QT_VERSION) PKG_RELEASE:=1 PKG_HASH:=415dbbb82a75dfc9a7be969e743bee54c0e6867be37bce4cf8f03da39f20112a @@ -23,7 +24,6 @@ PKG_BUILD_DEPENDS:=qt5tools/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include ../common.mk include ../qmake.mk define Package/qt5translations -- 2.30.2